authhelper: Tweak auth report escaping #6212
Open
+112
−34
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
psiinon
approved these changes
Feb 21, 2025
|
Great job, no security vulnerabilities found in this Pull Request |
kingthorin
force-pushed
the
auth-rpt-fix
branch
6 times, most recently
from
9f579dd to
d59176c
Compare
kingthorin
commented
Feb 21, 2025
There was a problem hiding this comment.
Stats need update too
addOns/authhelper/src/main/zapHomeFiles/reports/auth-report-json/report.json
Show resolved
Hide resolved
kingthorin
force-pushed
the
auth-rpt-fix
branch
from
d59176c to
3f42a7a
Compare
|
I believe this is as expected now. |
thc202
reviewed
Feb 24, 2025
| ZonedDateTime zonedDateTime = localDateTime.atZone(ZoneId.systemDefault()); | ||
| String current = zonedDateTime.format(DateTimeFormatter.RFC_1123_DATE_TIME); | ||
| String expected = | ||
| "{\n\t\"@programName\": \"ZAP\",\n\t\"@version\": \"Test Build\",\n\t\"@generated\": \"@@@replace@@@\",\n\t\"site\": \"https:\\/\\/www.example.com\"\n\t\n\t,\"summaryItems\": [\n\t\t{\n\t\t\t\"description\": \"Bob's \\\"Item\\\"\",\n\t\t\t\"passed\": true,\n\t\t\t\"key\": \"summary.1\"\n\t\t},\n\t\t{\n\t\t\t\"description\": \"Foo bar\",\n\t\t\t\"passed\": true,\n\t\t\t\"key\": \"summary.\\\"2\\\"\"\n\t\t}\n\t]\n\t\n\t\n\t,\"afEnv\": \" env:\\n contexts:\\n name: 'some \\\"quote\\\" name'\\n\"\n\t\n\t\n\t,\"statistics\": [\n\t\t{\n\t\t\t\"key\": \"stats.auth.1\",\n\t\t\t\"scope\": \"foo \\\"random\\\" bar\",\n\t\t\t\"value\": 123\n\t\t},\n\t\t{\n\t\t\t\"key\": \"stats.foo.oops \\\"foo\\\" bar\",\n\t\t\t\"scope\": \"global\",\n\t\t\t\"value\": 0\n\t\t}\n\t]\n\t\n}\n" |
There was a problem hiding this comment.
Would still be good to use text block to improve the readability.
There was a problem hiding this comment.
I'll see what I can do.
I think I actually got it in this form from the tests or something...
thc202
reviewed
Feb 24, 2025
...per/src/test/java/org/zaproxy/addon/authhelper/report/ExtensionAuthhelperReportUnitTest.java
Outdated
Show resolved
Hide resolved
kingthorin
force-pushed
the
auth-rpt-fix
branch
from
3f42a7a to
9945c29
Compare
|
Done & done |
Signed-off-by: kingthorin <[email protected]>
kingthorin
force-pushed
the
auth-rpt-fix
branch
from
9945c29 to
b1ecf62
Compare
|
And fixed 😀 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Overview
Ensure output is escaped as expected. Booleans without quotes, strings with inner quotes escaped etc.
Related Issues
n/a
Note: Some of these tests fail on windows, likely due to line ending differences. But work fine via git bash/gradle.
Checklist
./gradlew spotlessApplyfor code formatting